From f51dfb7af890227733c74d88f6b2b7c204c7c82f Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 9 Dec 2015 17:38:38 +0100
Subject: [PATCH] Adwaita: some more color tweaks and sass simplification

---
 gtk/theme/Adwaita/_colors.scss           |  2 +-
 gtk/theme/Adwaita/_drawing.scss          | 21 ++++-----------------
 gtk/theme/Adwaita/gtk-contained-dark.css |  4 ++--
 gtk/theme/Adwaita/gtk-contained.css      |  4 ++--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index 4f1c1e831d..a44b761892 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -16,7 +16,7 @@ $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($se
 $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%));
 $top_hilight: $borders_edge;
 $dark_fill: mix($borders_color, $bg_color, 35%);
-$headerbar_color: if($variant == 'light', lighten($bg_color, 2%), darken($bg_color, 5%));
+$headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 6%));
 
 $scrollbar_bg_color: darken($bg_color, 7%);
 
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 4649894522..43023ed2f0 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -463,30 +463,17 @@
   @else { box-shadow: none; }
 }
 
-@function headerbar_gradient($c, $tc:lighten($c, 2%)) {
-//
-// headerbar gradient helper function
-//
-// $c:  base color
-// $tc: top color
-//
-  @return linear-gradient(to top, $c, $tc 10%);
-}
-
-@mixin headerbar_fill($c:$headerbar_color, $tc:lighten($c, 2%), $hc:$top_hilight) {
+@mixin headerbar_fill($c:$headerbar_color, $hc:$top_hilight) {
 //
 // headerbar fill
 //
 // $c:  base color
-// $tc: top color
 // $hc: top highlight color
 //
-  $_bottom_shade_color: if($variant == 'light', mix(_border_color($c), $c, 20%),
-                                                mix(_border_color($c), $c, 10%));
 
-  background-image: headerbar_gradient($c, $tc);
-  box-shadow: inset 0 -1px $_bottom_shade_color, // bottom shade
-              inset 0 1px $hc; // top highlight
+  @if $variant == 'light' { background-image: linear-gradient(to top, darken($c, 13%), darken($c, 2%) 2px, $c 3px); }
+  @else { background-image: linear-gradient(to top, darken($c, 3%), darken($c, 1%) 2px, $c 3px); }
+  box-shadow: inset 0 1px $hc; // top highlight
 
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index f4f5074047..2ba01b51cb 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1598,8 +1598,8 @@ headerbar {
   border-color: #1c1f1f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
-  background-image: linear-gradient(to top, #2d3232, #323737 10%);
-  box-shadow: inset 0 -1px #292d2d, inset 0 1px rgba(238, 238, 236, 0.07); }
+  background-image: linear-gradient(to top, #232727, #282c2c 2px, #2a2f2f 3px);
+  box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop,
   headerbar:backdrop {
     border-color: #1f2222;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 78cb24672f..60211f551e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1598,8 +1598,8 @@ headerbar {
   border-color: #9d9d99;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
-  background-image: linear-gradient(to top, #ededec, #f2f2f1 10%);
-  box-shadow: inset 0 -1px #e1e1df, inset 0 1px rgba(255, 255, 255, 0.8); }
+  background-image: linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop,
   headerbar:backdrop {
     border-color: #a5a5a1;
-- 
2.30.2